Don't return "" as match. (fd.o #9544, Yevgen Muntyan)

2007-01-07  Matthias Clasen  <mclasen@redhat.com>

	* xdgmimecache.c (cache_glob_node_lookup_suffix): Don't return ""
	as match.  (fd.o #9544, Yevgen Muntyan)

svn path=/trunk/; revision=17112

diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog
index 9b4f106f18059d8cb6fe50f94115844bdbcdfbd8..015e3c24036e21b6ab827fe4e2bef59ea0178dc1 100644 (file)
--- a/gtk/xdgmime/ChangeLog
+++ b/gtk/xdgmime/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+       * xdgmimecache.c (cache_glob_node_lookup_suffix): Don't return "" 
+       as match.  (fd.o #9544, Yevgen Muntyan)
+
 2007-01-07  Matthias Clasen  <mclasen@redhat.com>
 
        * xdgmimecache.c (_xdg_mime_cache_list_mime_parents): Fix 

diff --git a/gtk/xdgmime/xdgmimecache.c b/gtk/xdgmime/xdgmimecache.c
index a8035798d4acb5b318f9e3c443a27c954d7c6a05..8804eab51f3542f7058a71e75243eeff8ab6d11f 100644 (file)
--- a/gtk/xdgmime/xdgmimecache.c
+++ b/gtk/xdgmime/xdgmimecache.c
@@ -463,7 +463,8 @@ cache_glob_node_lookup_suffix (XdgMimeCache *cache,
            {
              mimetype_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 4);
              n = 0;
-             mime_types[n++] = cache->buffer + mimetype_offset;
+             if (mimetype_offset)
+               mime_types[n++] = cache->buffer + mimetype_offset;
              
              n_children = GET_UINT32 (cache->buffer, offset + 16 * mid + 8);
              child_offset = GET_UINT32 (cache->buffer, offset + 16 * mid + 12);